From bbe5980c5412337687cac8d648d5ad069086ccae Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 Oct 2016 06:19:07 -0400 Subject: [PATCH] Make docs parallel installable This addresses gdk and gtk docs. --- configure.ac | 2 +- docs/reference/gdk/Makefile.am | 4 +-- docs/reference/gdk/gdk-docs.sgml | 2 +- .../{gdk3-sections.txt => gdk4-sections.txt} | 0 docs/reference/gdk/{gdk3.types => gdk4.types} | 0 docs/reference/gtk/Makefile.am | 28 +++++++++---------- docs/reference/gtk/gtk-docs.sgml | 20 ++++++------- ...es-3.0.xml => gtk-query-immodules-4.0.xml} | 0 ...lication.xml => gtk4-demo-application.xml} | 0 .../gtk/{gtk3-demo.xml => gtk4-demo.xml} | 0 ...icon-browser.xml => gtk4-icon-browser.xml} | 0 .../{gtk3-sections.txt => gtk4-sections.txt} | 0 ...et-factory.xml => gtk4-widget-factory.xml} | 0 .../gtk/{gtk3.types.in => gtk4.types.in} | 0 docs/reference/libgail-util/Makefile.am | 4 +-- .../libgail-util/gail-libgail-util3.types | 0 ...ns.txt => gail-libgail-util4-sections.txt} | 0 17 files changed, 30 insertions(+), 30 deletions(-) rename docs/reference/gdk/{gdk3-sections.txt => gdk4-sections.txt} (100%) rename docs/reference/gdk/{gdk3.types => gdk4.types} (100%) rename docs/reference/gtk/{gtk-query-immodules-3.0.xml => gtk-query-immodules-4.0.xml} (100%) rename docs/reference/gtk/{gtk3-demo-application.xml => gtk4-demo-application.xml} (100%) rename docs/reference/gtk/{gtk3-demo.xml => gtk4-demo.xml} (100%) rename docs/reference/gtk/{gtk3-icon-browser.xml => gtk4-icon-browser.xml} (100%) rename docs/reference/gtk/{gtk3-sections.txt => gtk4-sections.txt} (100%) rename docs/reference/gtk/{gtk3-widget-factory.xml => gtk4-widget-factory.xml} (100%) rename docs/reference/gtk/{gtk3.types.in => gtk4.types.in} (100%) delete mode 100644 docs/reference/libgail-util/gail-libgail-util3.types rename docs/reference/libgail-util/{gail-libgail-util3-sections.txt => gail-libgail-util4-sections.txt} (100%) diff --git a/configure.ac b/configure.ac index c6b229f902..d1df8eccb3 100644 --- a/configure.ac +++ b/configure.ac @@ -1933,7 +1933,7 @@ docs/reference/Makefile docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile -docs/reference/gtk/gtk3.types +docs/reference/gtk/gtk4.types docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile docs/reference/libgail-util/version.xml diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index d86a188784..4e62ea38eb 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.6 # The name of the module. -DOC_MODULE=gdk3 +DOC_MODULE=gdk4 # The top-level SGML file. DOC_MAIN_SGML_FILE=gdk-docs.sgml @@ -61,7 +61,7 @@ AM_CPPFLAGS = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS) +GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-4.la $(GDK_DEP_LIBS) # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS=--output-format=xml --name-space=gdk diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index a34b30c155..19125711c1 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -6,7 +6,7 @@ ]> - GDK 3 Reference Manual + GDK 4 Reference Manual This document is for the GDK 3 library, version &version; The latest versions can be found online at diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk4-sections.txt similarity index 100% rename from docs/reference/gdk/gdk3-sections.txt rename to docs/reference/gdk/gdk4-sections.txt diff --git a/docs/reference/gdk/gdk3.types b/docs/reference/gdk/gdk4.types similarity index 100% rename from docs/reference/gdk/gdk3.types rename to docs/reference/gdk/gdk4.types diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 5a88a12453..fc490cdc4b 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.6 # The name of the module. -DOC_MODULE=gtk3 +DOC_MODULE=gtk4 # The top-level SGML file. DOC_MAIN_SGML_FILE=gtk-docs.sgml @@ -270,8 +270,8 @@ CPPFLAGS += \ -UGTK_DISABLE_SINGLE_INCLUDES GTKDOC_LIBS = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) @@ -291,14 +291,14 @@ content_files = \ drawing-model.xml \ getting_started.xml \ glossary.xml \ - gtk3-demo-application.xml \ - gtk3-demo.xml \ - gtk3-icon-browser.xml \ - gtk3-widget-factory.xml \ + gtk4-demo-application.xml \ + gtk4-demo.xml \ + gtk4-icon-browser.xml \ + gtk4-widget-factory.xml \ gtk-builder-tool.xml \ gtk-encode-symbolic-svg.xml \ gtk-launch.xml \ - gtk-query-immodules-3.0.xml \ + gtk-query-immodules-4.0.xml \ gtk-query-settings.xml \ gtk-update-icon-cache.xml \ input-handling.xml \ @@ -498,19 +498,19 @@ endif include $(top_srcdir)/gtk-doc.make # Other files to distribute -EXTRA_DIST += version.xml.in gtk3.types.in +EXTRA_DIST += version.xml.in gtk4.types.in ######################################################################## man_MANS = \ - gtk-query-immodules-3.0.1 \ + gtk-query-immodules-4.0.1 \ gtk-update-icon-cache.1 \ gtk-encode-symbolic-svg.1 \ gtk-launch.1 \ - gtk3-demo.1 \ - gtk3-demo-application.1 \ - gtk3-widget-factory.1 \ - gtk3-icon-browser.1 \ + gtk4-demo.1 \ + gtk4-demo-application.1 \ + gtk4-widget-factory.1 \ + gtk4-icon-browser.1 \ broadwayd.1 \ gtk-builder-tool.1 \ gtk-query-settings.1 diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 8c962aeb07..f0d89857a0 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -8,13 +8,13 @@ ]> - GTK+ 3 Reference Manual + GTK+ 4 Reference Manual - This document is for the GTK+ 3 library, version &version;. + This document is for the GTK+ 4 library, version &version;. The latest versions can be found online at - http://developer.gnome.org/gtk3/. - If you are looking for the older GTK+ 2 series of libraries, - see http://developer.gnome.org/gtk2/. + http://developer.gnome.org/gtk4/. + If you are looking for the older GTK+ 3 series of libraries, + see http://developer.gnome.org/gtk3/. @@ -410,11 +410,11 @@ GTK+ Tools - - - - - + + + + + diff --git a/docs/reference/gtk/gtk-query-immodules-3.0.xml b/docs/reference/gtk/gtk-query-immodules-4.0.xml similarity index 100% rename from docs/reference/gtk/gtk-query-immodules-3.0.xml rename to docs/reference/gtk/gtk-query-immodules-4.0.xml diff --git a/docs/reference/gtk/gtk3-demo-application.xml b/docs/reference/gtk/gtk4-demo-application.xml similarity index 100% rename from docs/reference/gtk/gtk3-demo-application.xml rename to docs/reference/gtk/gtk4-demo-application.xml diff --git a/docs/reference/gtk/gtk3-demo.xml b/docs/reference/gtk/gtk4-demo.xml similarity index 100% rename from docs/reference/gtk/gtk3-demo.xml rename to docs/reference/gtk/gtk4-demo.xml diff --git a/docs/reference/gtk/gtk3-icon-browser.xml b/docs/reference/gtk/gtk4-icon-browser.xml similarity index 100% rename from docs/reference/gtk/gtk3-icon-browser.xml rename to docs/reference/gtk/gtk4-icon-browser.xml diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk4-sections.txt similarity index 100% rename from docs/reference/gtk/gtk3-sections.txt rename to docs/reference/gtk/gtk4-sections.txt diff --git a/docs/reference/gtk/gtk3-widget-factory.xml b/docs/reference/gtk/gtk4-widget-factory.xml similarity index 100% rename from docs/reference/gtk/gtk3-widget-factory.xml rename to docs/reference/gtk/gtk4-widget-factory.xml diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk4.types.in similarity index 100% rename from docs/reference/gtk/gtk3.types.in rename to docs/reference/gtk/gtk4.types.in diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am index 263471d9b8..35f073c785 100644 --- a/docs/reference/libgail-util/Makefile.am +++ b/docs/reference/libgail-util/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.7 # The name of the module. -DOC_MODULE=gail-libgail-util3 +DOC_MODULE=gail-libgail-util4 # The top-level SGML file. DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml @@ -22,7 +22,7 @@ AM_CPPFLAGS = \ -I$(top_builddir) \ $(DEP_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-3.la +GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-4.la # gtkdoc-mkdb related varaibles MKDB_OPTIONS = diff --git a/docs/reference/libgail-util/gail-libgail-util3.types b/docs/reference/libgail-util/gail-libgail-util3.types deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/docs/reference/libgail-util/gail-libgail-util3-sections.txt b/docs/reference/libgail-util/gail-libgail-util4-sections.txt similarity index 100% rename from docs/reference/libgail-util/gail-libgail-util3-sections.txt rename to docs/reference/libgail-util/gail-libgail-util4-sections.txt -- 2.30.2